On branch mergify/bp/release/v28.x.y/pr-4347
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 1fc0b9af.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   changelog.md
	modified:   ignite/cmd/generate_composables.go
	modified:   ignite/cmd/generate_hooks.go
	modified:   ignite/pkg/cosmosanalysis/module/module.go
	new file:   ignite/pkg/cosmosgen/generate_typescript_test.go
	modified:   ignite/pkg/cosmosgen/templates/module/module.ts.tpl
	modified:   ignite/pkg/cosmosgen/templates/module/registry.ts.tpl
	modified:   ignite/pkg/cosmosgen/templates/module/types.ts.tpl
	new file:   ignite/pkg/cosmosgen/templates/rest/rest.ts.tpl
	modified:   ignite/pkg/cosmosgen/templates/root/client.ts.tpl
	modified:   ignite/pkg/cosmosgen/templates/root/index.ts.tpl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ignite/cmd/generate_typescript_client.go
	both modified:   ignite/pkg/cosmosgen/generate_typescript.go
	both modified:   ignite/pkg/cosmosgen/template.go